From 3ebe37329ff822a80ef777484aa6bf20de1baeb9 Mon Sep 17 00:00:00 2001
From: oliskoli <oliskoli>
Date: Sun, 20 May 2007 21:20:57 +0000
Subject: [PATCH] garmin_poi: Add gpi writer code.

---
 garmin_poi.c | 809 ---------------------------------------------------
 garmin_poi.h | 112 -------
 2 files changed, 921 deletions(-)
 delete mode 100644 garmin_poi.c
 delete mode 100644 garmin_poi.h

diff --git a/garmin_poi.c b/garmin_poi.c
deleted file mode 100644
index 30acc74aa..000000000
--- a/garmin_poi.c
+++ /dev/null
@@ -1,809 +0,0 @@
-/*
-
-    Support for Garmin Points of Interest (.gpi files)
-    
-    Copyright (C) 2007 Olaf Klein, o.b.klein@gpsbabel.org
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA
-
- */
- 
-/*
-	History:
-
-	* 2007/05/18: initial release (only a reader)
-	* 2007/05/20: added writer code with embedded bitmap
-
-	ToDo:
-	
-	* Display mode ("Symbol & Name")
-	* decode speed/proximity
-	* support category from GMSD "Garmin Special Data"
-*/
-
-#include "defs.h"
-#include "cet_util.h"
-#include "jeeps/gpsmath.h"
-#include "garmin_poi.h"
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-
-#define MYNAME "garmin_poi"
-
-#define GPI_DBG 1
-#undef GPI_DBG
-
-#define DEFAULT_ICON	"Waypoint"
-
-static char *opt_cat, *opt_pos, *opt_notes, *opt_hide, *opt_descr;
-
-static arglist_t garmin_poi_args[] = {
-	{"category", &opt_cat, "Default category on output", 
-		"My points", ARGTYPE_STRING, ARG_NOMINMAX},
-	{"hide", &opt_hide, "Don't show gpi bitmap on device", 
-		NULL, ARGTYPE_BOOL, ARG_NOMINMAX},
-	{"descr", &opt_descr, "Write description to address field", 
-		NULL, ARGTYPE_BOOL, ARG_NOMINMAX},
-	{"notes", &opt_notes, "Write notes to address field", 
-		NULL, ARGTYPE_BOOL, ARG_NOMINMAX},
-	{"position", &opt_pos, "Write position to address field", 
-		NULL, ARGTYPE_BOOL, ARG_NOMINMAX},
-	ARG_TERMINATOR
-};
-
-typedef struct {
-	int D2;
-	char S3[9];		/* "GRMRECnn" */
-	time_t crdate;		/* creation date and time */
-	char POI[4];		/* "POI" */
-	char S8[3];
-	char *group;
-	char *category;
-} gpi_data_t;
-
-static gbfile *fin, *fout;
-static gbint32 codepage;	/* code-page, i.e. 1252 */
-static gpi_data_t *dt;
-static queue wptq;
-static int all_points_sz;
-static bounds bds;
-static short_handle short_h;
-
-#ifdef GPI_DBG
-# define PP printf("@%1$6x (%1$8d): ", gbftell(fin))
-#else
-# define PP
-#endif
-
-#ifdef GPI_DBG
-static void
-store_bitmap(const char *filename, int sz)
-{
-	gbfile *fout;
-	
-	fout = gbfopen_le(filename, "wb", MYNAME);
-	
-	while (! gbfeof(fin)) {
-		char buff[256];
-		int len;
-		
-		len = sizeof(buff);
-		if (len > sz) len = sz;
-		sz -= len;
-		len = gbfread(buff, 1, len, fin);
-		gbfwrite(buff, 1, len, fout);
-		if (sz <= 0) break;
-	}
-	gbfclose(fout);
-}
-#endif
-
-/*******************************************************************************
-* %%%                             gpi reader                               %%% *
-*******************************************************************************/
-
-/* read a string with embedded "EN" header */
-static char *
-read_string(const int *sz)
-{
-	char en[3];
-	short slen;
-	char *res;
-	
-	gbfread(&en, 1, 2, fin);
-	
-	en[2] = '\0';
-	if (strcmp(en, "EN") != 0) {
-		fatal(MYNAME  ": Out of sync ('EN' expected)!\n");
-	}
-	
-	slen = gbfgetint16(fin);
-	if (sz && (*sz != slen + 4)) {
-		fatal(MYNAME  ": Out of sync (wrong string size)!\n");
-	}
-	
-	if (slen > 0) {
-		res = xmalloc(slen + 1);
-		res[slen] = '\0';
-		gbfread(res, 1, slen, fin);
-	}
-	else res = NULL;
-	
-	return res;
-}
-
-
-static void
-read_header(void)
-{
-	int len, i;
-#ifdef GPI_DBG
-	struct tm tm;
-	char stime[32];
-#endif	
-
-	i = gbfgetint32(fin);
-	if (i != 0) i = gbfgetint32(fin);
-	dt->D2 = gbfgetint32(fin);
-
-	gbfread(&dt->S3, 1, sizeof(dt->S3) - 1, fin);	/* GRMRECnn */
-	if (strncmp(dt->S3, "GRMREC", 6) != 0)
-		fatal(MYNAME ": No GPI file!\n");
-
-	PP;
-	dt->crdate = gbfgetint32(fin);
-#ifdef GPI_DBG
-	tm = *localtime(&dt->crdate);
-	tm.tm_year += 20;	/* !!! */
-	tm.tm_mday -= 1;	/* !!! */
-	strftime(stime, sizeof(stime), "%Y/%m/%d %H:%M:%S", &tm);
-	printf("crdate = %lu (%s)\n", dt->crdate, stime);
-#endif	
-	
-	(void) gbfgetint16(fin);	/* 0 */
-
-	len = gbfgetint16(fin);
-	gbfseek(fin, len, SEEK_CUR);	/* "my.gpi" */
-
-	(void) gbfgetint32(fin);	/* 1 */
-	(void) gbfgetint32(fin);	/* 12 */
-
-	gbfread(&dt->POI, 1, sizeof(dt->POI) - 1, fin);
-	if (strcmp(dt->POI, "POI") != 0)
-		fatal(MYNAME ": Wrong or unsupported GPI file!\n");
-
-	for (i = 0; i < 3; i++) (void)gbfgetc(fin);
-	gbfread(&dt->S8, 1, sizeof(dt->S8) - 1, fin);
-
-	codepage = gbfgetint32(fin);
-
-#ifdef GPI_DBG
-	PP;
-	printf("< leaving header\n");
-#endif	
-}
-
-/* gpi tag handler */
-static int read_tag(const char *caller, const int tag, waypoint *wpt);
-
-
-/* read a single poi with all options */
-static void
-read_poi(const int sz)
-{
-	int pos, len;
-	waypoint *wpt;
-	
-#if GPI_DBG
-	PP;
-	printf("> reading poi (size %d)\n", sz);
-#endif	
-	PP;
-	len = gbfgetint32(fin);	/* sub-header size */
-#if GPI_DBG
-	printf("poi sublen = %1$d (0x%1$x)\n", len);
-#endif	
-	pos = gbftell(fin);
-	
-	wpt = waypt_new();
-	wpt->icon_descr = DEFAULT_ICON;
-	
-	wpt->latitude = GPS_Math_Semi_To_Deg(gbfgetint32(fin));
-	wpt->longitude = GPS_Math_Semi_To_Deg(gbfgetint32(fin));
-	
-	(void) gbfgetint16(fin);	/* ? always 1 ? */
-	(void) gbfgetc(fin);		/* seems to 1 when extra options present */
-	
-	len = gbfgetint32(fin);
-	
-	PP;
-	wpt->shortname = read_string(&len);
-#ifdef GPI_DBG
-	printf("shortname = %s\n", wpt->shortname);
-#endif	
-	
-	while (gbftell(fin) < (pos + sz - 4)) {
-		int tag = gbfgetint32(fin);
-		if (! read_tag("read_poi", tag, wpt)) break;
-	}
-
-	if (wpt->notes && !wpt->description) wpt->description = xstrdup(wpt->notes);
-	if (wpt->description && !wpt->notes) wpt->notes = xstrdup(wpt->description);
-
-	waypt_add(wpt);
-
-#ifdef GPI_DBG
-	PP;
-	printf("< leaving poi\n");
-#endif	
-}
-
-/* read poi's following a group header */
-static void
-read_poi_list(const int sz)
-{
-	int pos, i;
-	
-	pos = gbftell(fin);
-#ifdef GPI_DBG
-	PP;
-	printf("> reading poi list (-> %1$x / %1$d )\n", pos + sz);
-#endif
-	PP;
-	i = gbfgetint32(fin);	/* mostly 23 (0x17) */
-#ifdef GPI_DBG
-	printf("list sublen = %1$d (0x%1$x)\n", i);
-#endif	
-	(void) gbfgetint32(fin);	/* max-lat */
-	(void) gbfgetint32(fin);	/* max-lon */
-	(void) gbfgetint32(fin);	/* min-lat */
-	(void) gbfgetint32(fin);	/* min-lon */
-	
-	(void) gbfgetc(fin);		/* three unknown bytes */
-	(void) gbfgetc(fin);		/* ? should be zero ? */
-	(void) gbfgetc(fin);
-	
-	(void) gbfgetint32(fin);	/* ? const 0x1000100 ? */
-	
-	while (gbftell(fin) < (pos + sz - 4)) {
-		int tag = gbfgetint32(fin);
-		if (! read_tag("read_poi_list", tag, NULL)) return;
-	}
-#ifdef GPI_DBG
-	PP;
-	printf("< leaving poi list\n");
-#endif
-}
-
-
-static void
-read_poi_group(const int sz, const int tag)
-{
-	int len, pos;
-
-	pos = gbftell(fin);
-#ifdef GPI_DBG
-	PP;
-	printf("> reading poi group (-> %1$x / %1$d)\n", pos + sz);
-#endif
-	if (tag == 0x80009) {
-		int subsz;
-		
-		PP;
-		subsz = gbfgetint32(fin);	/* ? offset to category data ? */
-#ifdef GPI_DBG
-		printf("group sublen = %d (-> %x / %d)\n", subsz, pos + subsz + 4, pos + subsz + 4);
-#endif
-	}
-
-	len = gbfgetint32(fin);	/* size of group string */
-	PP;
-	if (dt->group) xfree(dt->group);
-	dt->group = read_string(&len);
-#ifdef GPI_DBG
-	printf("Group \"%s\"\n", dt->group);
-#endif
-	while (gbftell(fin) < (pos + sz)) {
-		int subtag = gbfgetint32(fin);
-		if (! read_tag("read_poi_group", subtag, NULL)) break;
-	}
-	
-#ifdef GPI_DBG
-	PP;
-	printf("< leaving poi group\n");
-#endif
-}
-
-
-/* gpi tag handler */
-static int
-read_tag(const char *caller, const int tag, waypoint *wpt)
-{
-	int pos, sz, len;
-	char *str;
-#ifdef GPI_DBG
-	int subtag;
-#endif
-	
-	sz = gbfgetint32(fin);
-	pos = gbftell(fin);
-	
-#ifdef GPI_DBG
-	PP;
-	printf("%s: tag = 0x%x (size %d)\n", caller, tag, sz);
-#endif
-	if ((tag >= 0x80000) && (tag <= 0x800ff)) sz += 4;
-	
-	switch(tag) {
-		case 0x3:	/* size = 12 ? sound */
-		case 0x4:	/* size = 2  ? */
-		case 0x6:	/* size = 2  ? */
-			break;
-			
-		case 0x5:	/* group bitmap (BMP: <= 24x24) */
-#ifdef GPI_DBG
-			// store_bitmap("gpi_bitmap", sz);
-#endif
-			break;
-
-		case 0x7:	/* category */
-			(void) gbfgetint32(fin);
-			(void) gbfgetint16(fin);
-			if (dt->category) xfree(dt->category);
-			PP;
-			dt->category = read_string(NULL);
-#ifdef GPI_DBG
-			printf("Category: \"%s\"\n", dt->category);
-#endif
-			break;
-			
-		case 0xa:	/* description */
-			len = gbfgetint32(fin);
-			PP;
-			wpt->description = read_string(&len);
-#ifdef GPI_DBG
-			printf("Description: \"%s\"\n", wpt->description);
-#endif
-			break;
-			
-		case 0xe:	/* ? notes ? */
-			(void) gbfgetc(fin);
-			if (dt->D2 == 0x1D) {
-				len = gbfgetint32(fin);
-				PP;
-				str = read_string(NULL);
-			}
-			else {
-				len = gbfgetint16(fin);
-				str = xmalloc(len + 1);
-				str[len] = '\0';
-				PP;
-				gbfread(str, 1, len, fin);
-			}
-#ifdef GPI_DBG
-			printf("Notes: \"%s\"\n", str);
-#endif
-			if (wpt->description) wpt->notes = str;
-			else wpt->description = str;
-			break;
-
-		case 0x80002:
-			read_poi(sz);
-			break;
-
-		case 0x80008:
-			read_poi_list(sz);
-			break;
-
-		case 0x9:	/* ? older versions / no category data ? */
-		case 0x80009:	/* current POI loader */
-			read_poi_group(sz, tag);
-			break;
-			
-		case 0x8000b:	/* address (street/city...) */
-			gbfseek(fin, sz, SEEK_CUR);
-			/* ToDo */
-			break;
-
-		case 0x8000c:	/* phone-number */
-#ifdef GPI_DBG
-			PP;
-			subtag = gbfgetint32(fin);
-			printf("phone-number tag %d\n", subtag);
-			(void) gbfgetint16(fin); /* unknown / ? phone/fax/mobil ? */
-			PP;
-			len = gbfgetint16(fin);
-			printf("phone-number len %d\n", len);
-			str = xmalloc(len + 1);
-			str[len] = '\0';
-			PP;
-			gbfread(str, 1, len, fin);
-			printf("phone-number \"%s\"\n", str);
-			xfree(str);
-#endif
-			break;
-
-		case 0x80012:	/* ? sounds / images ? */
-			break;
-
-		default:
-			warning(MYNAME ": Unknown tag (0x%x). Please report!\n", tag);
-			return 0;
-	}
-	gbfseek(fin, pos + sz, SEEK_SET);
-	return 1;
-}
-
-/*******************************************************************************
-* %%%                             gpi writer                               %%% *
-*******************************************************************************/
-
-static void
-write_string(const char *str)
-{
-	int len = strlen(str);
-	
-	gbfwrite("EN", 1, 2, fout);
-	gbfputint16(len, fout);
-	gbfwrite(str, 1, len, fout);
-}
-
-
-static char
-compare_strings(const char *s1, const char *s2)
-{
-	if (s1 == s2) return 0;
-	else if (s1) {
-		if (s2) return strcmp(s1, s2);
-		else return 1;
-	}
-	else return 1;
-}
-
-
-static void
-write_header(void)
-{
-	struct tm tm;
-	time_t time;
-	
-	tm = *gmtime(&gpsbabel_now);
-	tm.tm_year -= 20;
-	time = mkgmtime(&tm);
-	time += SECONDS_PER_DAY;
-	
-	gbfputint32(0, fout);
-	gbfputint32(0x16, fout);
-	gbfwrite("GRMREC00", 1, 8, fout);
-	gbfputint32(time, fout);
-	gbfputint16(0, fout);
-	gbfputint16(6, fout);
-	gbfwrite("my.gpi", 1, 6, fout);
-	gbfputint32(1, fout);
-	gbfputint32(0xc, fout);
-	gbfwrite("POI", 1, 3, fout);
-	gbfputc(0, fout);
-	gbfputc(0, fout);
-	gbfputc(0, fout);
-	gbfwrite("00", 1, 2, fout);
-	gbfputint32(codepage, fout);
-}
-
-static void
-enum_waypt_cb(const waypoint *ref)
-{
-	waypoint *wpt;
-	char *str;
-	queue *elem, *tmp;
-
-	QUEUE_FOR_EACH(&wptq, elem, tmp) {
-		waypoint *cmp = (waypoint *) elem;
-		
-		if ((compare_strings(cmp->shortname, ref->shortname) == 0) &&
-		    (cmp->latitude == ref->latitude) &&
-		    (cmp->longitude == ref->longitude) &&
-		    (compare_strings(cmp->description, ref->description) == 0)) return;
-	}
-	
-	wpt = waypt_dupe(ref);
-
-	ENQUEUE_TAIL(&wptq, &wpt->Q);
-
-	str = mkshort(short_h, wpt->shortname);
-	xfree(wpt->shortname);
-	wpt->shortname = str;
-	
-	all_points_sz += 12;		/* tag/sz/sub-sz */
-	all_points_sz += 19;		/* poi fixed size */
-	all_points_sz += strlen(wpt->shortname);
-	all_points_sz += 10;		/* tag(4) */
-
-	str = NULL;
-	if (opt_descr) {
-		if (wpt->description && *wpt->description)
-			str = xstrdup(wpt->description);
-	}
-	else if (opt_notes) {
-		if (wpt->notes && *wpt->notes)
-			str = xstrdup(wpt->notes);
-	}
-	else if (opt_pos)
-		str = pretty_deg_format(wpt->latitude, wpt->longitude, 's', 0);
-
-	if (str) {	/* this will be stored into street-address field */
-		all_points_sz += 22 + strlen(str);
-		wpt->extra_data = str;
-	}
-	
-	str = wpt->description;
-	if (! str) str = wpt->notes;
-	if (str) all_points_sz += (16 + strlen(str));
-		
-	waypt_add_to_bounds(&bds, wpt);
-}
-
-
-static int
-compare_wpt_cb(const queue *a, const queue *b)
-{
-	const waypoint *wa = (waypoint *) a;
-	const waypoint *wb = (waypoint *) b;
-	
-	return strcmp(wa->shortname, wb->shortname);
-}
-
-
-static void
-write_data(const char *group)
-{
-	queue *elem, *tmp;
-	int size;
-	
-	size = all_points_sz;
-	size += 8;
-	size += strlen(group);
-	
-	size += 12 + 23;
-	
-	/* --- group header --- */
-	
-	gbfputint32(0x80009, fout);
-	gbfputint32(size + BMP_SIZE + 8, fout);
-	gbfputint32(size, fout);
-	
-	gbfputint32(strlen(group) + 4, fout);
-	write_string(group);
-	
-	/* --- list header --- */
-	
-	gbfputint32(0x80008, fout);
-	gbfputint32(all_points_sz + 23, fout);
-	gbfputint32(23, fout);
-
-	gbfputint32(GPS_Math_Deg_To_Semi(bds.max_lat), fout);
-	gbfputint32(GPS_Math_Deg_To_Semi(bds.max_lon), fout);
-	gbfputint32(GPS_Math_Deg_To_Semi(bds.min_lat), fout);
-	gbfputint32(GPS_Math_Deg_To_Semi(bds.min_lon), fout);
-	
-	gbfputc(0, fout);		/* three unknown bytes */
-	gbfputc(0, fout);		/* ? should be zero ? */
-	gbfputc(0, fout);
-	
-	gbfputint32(0x1000100, fout);	/* ? const 0x1000100 ? */
-	
-	QUEUE_FOR_EACH(&wptq, elem, tmp) {
-		char *str;
-		int s0, s1;
-		waypoint *wpt = (waypoint *)elem;
-		
-		str = wpt->description;
-		if (! str) str = wpt->notes;
-
-		/* --- poi header --- */
-		gbfputint32(0x80002, fout);		
-		
-		s0 = s1 = 19 + strlen(wpt->shortname);
-		s0 += 10;				/* tag(4) */
-		if (str) s0 += (16 + strlen(str));	/* descr */
-
-		if (wpt->extra_data)
-			s0 += 22 + strlen((char *)wpt->extra_data);
-
-		gbfputint32(s0, fout);	/* size of following data (tag) */
-		gbfputint32(s1, fout);	/* basic size (without options) */
-		
-		gbfputint32(GPS_Math_Deg_To_Semi(wpt->latitude), fout);
-		gbfputint32(GPS_Math_Deg_To_Semi(wpt->longitude), fout);
-	
-		gbfputint16(1, fout);	/* ? always 1 ? */
-		gbfputc(1, fout);	/* seems to be 1 when extra options present */
-					/* because we always write tag(4) this should be okay */
-		
-		gbfputint32(strlen(wpt->shortname) + 4, fout);
-		write_string(wpt->shortname);
-		
-		gbfputint32(4, fout);	/* tag(4) */
-		gbfputint32(2, fout);
-		if (opt_hide) gbfputint16(1, fout);	/* values != 0 hides the bitmap */
-		else gbfputint16(0, fout);
-		
-		if (str) {
-			gbfputint32(0xa, fout);
-			gbfputint32(strlen(str) + 8, fout);
-			gbfputint32(strlen(str) + 4, fout);
-			write_string(str);
-		}
-		
-		str = (char *)wpt->extra_data;
-		if (str) {
-			gbfputint32(0x8000b, fout);
-			gbfputint32(strlen(str) + 10, fout);
-			gbfputint32(0x2, fout);
-			gbfputint16(0x10, fout);	/* 0x10 = StreetAddress */
-			gbfputint32(strlen(str) + 4, fout);
-			write_string(str);
-			xfree(str);
-		}
-	}
-	
-	if (BMP_SIZE) {
-		gbfputint32(5, fout);	/* simple bitmap / GPSBabel logo */
-		gbfputint32(BMP_SIZE, fout);
-		gbfwrite(gpi_bitmap, 1, BMP_SIZE, fout);
-	}
-
-	gbfputc(-1, fout);		/* end of group */
-	gbfputint32(0xff, fout);	/* final tag */
-
-	gbfputint16(0, fout);
-	gbfputc(0, fout);
-}
-
-
-/*******************************************************************************
-* %%%        global callbacks called by gpsbabel main process              %%% *
-*******************************************************************************/
-
-static void
-garmin_poi_rd_init(const char *fname)
-{
-	char cp[8];
-	
-	fin = gbfopen_le(fname, "rb", MYNAME);
-	dt = xcalloc(1, sizeof(*dt));
-
-	read_header();
-	
-	if ((codepage >= 1250) && (codepage <= 1257)) {
-		snprintf(cp, sizeof(cp), "CP%d", codepage);
-		cet_convert_init(cp, 1);
-	}
-	else warning(MYNAME ": Unsupported code page (%d).\n", codepage);
-}
-
-
-static void
-garmin_poi_wr_init(const char *fname)
-{
-	char cp[8];
-	cet_cs_vec_t *vec;
-	int i;
-	
-	fout = gbfopen_le(fname, "wb", MYNAME);
-	
-	QUEUE_INIT(&wptq);
-	all_points_sz = 0;
-	waypt_init_bounds(&bds);
-
-	short_h = mkshort_new_handle();
-	
-	setshort_length(short_h, 1024);
-	setshort_badchars(short_h, "\r\n");
-	setshort_mustupper(short_h, 0);
-	setshort_mustuniq(short_h, 1);
-	setshort_whitespace_ok(short_h, 1);
-	setshort_repeating_whitespace_ok(short_h, 0);
-	setshort_defname(short_h, "POI");
-	
-	codepage = 0;
-	
-	for (i = 1250; i <= 1257; i++) {
-		snprintf(cp, sizeof(cp), "CP%d", i);
-		vec = cet_find_cs_by_name(cp);
-		if (vec == global_opts.charset) {
-			codepage = i;
-			break;
-		}
-	}
-	
-	if (! codepage) {
-		warning(MYNAME ": Unsupported character set (%s)!\n", global_opts.charset_name);
-		fatal(MYNAME ": Valid values are CP1250 to CP1257.\n");
-	}
-}
-
-
-static void 
-garmin_poi_rd_deinit(void)
-{
-	if (dt->category) xfree(dt->category);
-	if (dt->group) xfree(dt->group);
-	xfree(dt);
-	gbfclose(fin);
-}
-
-
-static void 
-garmin_poi_wr_deinit(void)
-{
-	queue *elem, *tmp;
-	
-	mkshort_del_handle(&short_h);
-	QUEUE_FOR_EACH(&wptq, elem, tmp) {
-		dequeue(elem);
-		waypt_free((waypoint *) elem);
-	}
-	gbfclose(fout);
-}
-
-
-static void
-garmin_poi_read(void)
-{
-	while (! gbfeof(fin)) {	/* main loop */
-		int tag;
-		
-		tag = gbfgetint32(fin);
-		if ((tag == 0xffff) || (tag == 0xff)) return;
-		if (! read_tag("garmin_poi_read", tag, NULL)) return;
-	};
-}
-
-
-static void
-garmin_poi_write(void)
-{
-	if (strlen(opt_cat) == 0) fatal(MYNAME ": Can't write empty category!\n");
-	
-	write_header();
-	waypt_disp_all(enum_waypt_cb);
-	sortqueue(&wptq, compare_wpt_cb);
-
-	write_data(opt_cat);
-}
-
-/**************************************************************************/
-
-ff_vecs_t garmin_poi_vecs = {
-	ff_type_file,
-	{ 
-		ff_cap_read | ff_cap_write 	/* waypoints */, 
-	  	ff_cap_none 			/* tracks */, 
-	  	ff_cap_none 			/* routes */
-	},
-	garmin_poi_rd_init,	
-	garmin_poi_wr_init,
-	garmin_poi_rd_deinit,	
-	garmin_poi_wr_deinit,
-	garmin_poi_read,
-	garmin_poi_write,
-	NULL,
-	garmin_poi_args,
-	CET_CHARSET_MS_ANSI, 0		/* WIN-CP1252 */
-};
-
-/**************************************************************************/
diff --git a/garmin_poi.h b/garmin_poi.h
deleted file mode 100644
index 1811cc84d..000000000
--- a/garmin_poi.h
+++ /dev/null
@@ -1,112 +0,0 @@
-#ifndef GARMIN_POI_H
-#define GARMIN_POI_H
-
-static char gpi_bitmap[] = {
-	0x00,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x08,0x00,0x00,0x00,0x40,0x02,0x00,0x00,
-	0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0xff,0x00,0xff,0x00,0x01,0x00,0x00,0x00,
-	0x6c,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7f,0x00,0x7e,0x7e,0x7e,
-	0x7e,0x7e,0x7e,0x7e,0x7e,0x7e,0x7e,0x7e,0x7e,0x7e,0x7e,0x7e,0x7e,0x7e,0x7e,0x7e,
-	0x7e,0x7e,0x00,0x7e,0x00,0x7e,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,
-	0x7f,0x7f,0x59,0x67,0x65,0x7f,0x7f,0x7f,0x7f,0x7f,0x00,0x7e,0x00,0x7e,0x7f,0x7f,
-	0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x74,0x3d,0x42,0x56,0x7e,0x7e,0x7f,
-	0x7f,0x7f,0x00,0x7e,0x00,0x7e,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,
-	0x7f,0x72,0x38,0x49,0x47,0x7e,0x7e,0x7f,0x7f,0x7f,0x00,0x7e,0x00,0x7e,0x7f,0x7f,
-	0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7d,0x37,0x47,0x7d,0x7e,0x7e,0x7f,
-	0x7f,0x7f,0x00,0x7e,0x00,0x7e,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,
-	0x7f,0x7d,0x37,0x47,0x7d,0x7e,0x7e,0x7f,0x7f,0x7f,0x00,0x7e,0x00,0x7e,0x7f,0x7f,
-	0x7f,0x7f,0x7f,0x7f,0x7f,0x7c,0x6c,0x50,0x44,0x5e,0x4f,0x76,0x7e,0x7f,0x7f,0x7f,
-	0x7f,0x7f,0x00,0x7e,0x00,0x7e,0x7f,0x77,0x7e,0x7f,0x7f,0x7e,0x62,0x0d,0x00,0x05,
-	0x10,0x08,0x09,0x59,0x7e,0x7e,0x7e,0x7f,0x7f,0x7f,0x00,0x7e,0x00,0x7e,0x29,0x1c,
-	0x4c,0x7f,0x7f,0x60,0x02,0x0c,0x2a,0x37,0x51,0x63,0x57,0x15,0x58,0x7e,0x7e,0x7f,
-	0x7f,0x7f,0x00,0x7e,0x00,0x7e,0x68,0x5a,0x41,0x5f,0x5f,0x07,0x0e,0x3d,0x41,0x41,
-	0x4d,0x55,0x6b,0x61,0x26,0x57,0x57,0x2b,0x2f,0x30,0x00,0x7e,0x00,0x7e,0x77,0x7d,
-	0x4e,0x3d,0x3d,0x16,0x35,0x41,0x7d,0x49,0x18,0x48,0x52,0x54,0x5b,0x31,0x31,0x63,
-	0x7f,0x7f,0x00,0x7e,0x00,0x7e,0x40,0x7d,0x75,0x47,0x47,0x41,0x35,0x40,0x72,0x1e,
-	0x7c,0x5d,0x1d,0x20,0x49,0x3d,0x3d,0x5b,0x7f,0x7f,0x00,0x7e,0x00,0x7e,0x60,0x5c,
-	0x7a,0x1a,0x1a,0x3b,0x38,0x5d,0x0e,0x59,0x7d,0x3c,0x72,0x37,0x78,0x60,0x60,0x28,
-	0x4f,0x71,0x00,0x7e,0x00,0x7e,0x7e,0x43,0x33,0x69,0x69,0x17,0x22,0x7d,0x2c,0x27,
-	0x2a,0x2b,0x7d,0x32,0x61,0x4f,0x4f,0x36,0x3f,0x4c,0x00,0x7e,0x00,0x7e,0x7f,0x7e,
-	0x3a,0x2b,0x2b,0x45,0x1a,0x40,0x47,0x7d,0x37,0x41,0x12,0x25,0x5e,0x46,0x46,0x4d,
-	0x62,0x53,0x00,0x7e,0x00,0x7e,0x7f,0x7e,0x73,0x71,0x71,0x6a,0x13,0x39,0x1b,0x45,
-	0x62,0x50,0x3a,0x7e,0x7e,0x7b,0x7b,0x5c,0x5b,0x49,0x00,0x7e,0x00,0x7e,0x7f,0x7e,
-	0x59,0x01,0x01,0x06,0x64,0x35,0x4e,0x3e,0x26,0x21,0x66,0x7f,0x45,0x04,0x04,0x11,
-	0x7f,0x7f,0x00,0x7e,0x00,0x7e,0x7f,0x7e,0x59,0x01,0x01,0x06,0x64,0x35,0x4e,0x3e,
-	0x26,0x21,0x66,0x7f,0x45,0x04,0x04,0x11,0x7f,0x7f,0x00,0x7e,0x00,0x7e,0x7f,0x7e,
-	0x7c,0x0a,0x0a,0x0f,0x65,0x7d,0x74,0x71,0x7c,0x7e,0x7e,0x7e,0x58,0x03,0x03,0x2b,
-	0x7f,0x7f,0x00,0x7e,0x00,0x7e,0x7f,0x7f,0x7f,0x6d,0x6d,0x6f,0x2d,0x1d,0x63,0x7a,
-	0x7e,0x75,0x5d,0x19,0x32,0x70,0x70,0x6f,0x7f,0x7f,0x00,0x7e,0x00,0x7e,0x7f,0x7f,
-	0x7f,0x7f,0x7f,0x7e,0x7d,0x53,0x35,0x0b,0x1f,0x0e,0x34,0x5a,0x7f,0x7f,0x7f,0x7f,
-	0x7f,0x7f,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7e,0x7f,0x7e,0x7e,0x7e,
-	0x7e,0x7e,0x7e,0x7e,0x7e,0x7e,0x7e,0x7e,0x7e,0x7e,0x7e,0x7e,0x7e,0x7e,0x7e,0x7e,
-	0x7e,0x7e,0x7e,0x7e,0x0a,0x0a,0x0a,0x00,0x0b,0x0b,0x0b,0x00,0x16,0x16,0x16,0x00,
-	0x1f,0x1f,0x1f,0x00,0x28,0x28,0x28,0x00,0x2d,0x2d,0x2d,0x00,0x35,0x35,0x35,0x00,
-	0x3d,0x3d,0x3d,0x00,0x40,0x40,0x40,0x00,0x41,0x41,0x41,0x00,0x43,0x43,0x43,0x00,
-	0x46,0x46,0x46,0x00,0x47,0x47,0x47,0x00,0x4b,0x4b,0x4b,0x00,0x4e,0x4e,0x4e,0x00,
-	0x53,0x53,0x53,0x00,0x54,0x54,0x54,0x00,0x56,0x56,0x56,0x00,0x59,0x59,0x59,0x00,
-	0x5a,0x5a,0x5a,0x00,0x5f,0x5f,0x5f,0x00,0x60,0x60,0x60,0x00,0x62,0x62,0x62,0x00,
-	0x63,0x63,0x63,0x00,0x6a,0x6a,0x6a,0x00,0x74,0x74,0x74,0x00,0x75,0x75,0x75,0x00,
-	0x76,0x76,0x76,0x00,0x78,0x78,0x78,0x00,0x79,0x79,0x79,0x00,0x7a,0x7a,0x7a,0x00,
-	0x7c,0x7c,0x7c,0x00,0x7d,0x7d,0x7d,0x00,0x7e,0x7e,0x7e,0x00,0x80,0x80,0x80,0x00,
-	0x81,0x81,0x81,0x00,0x82,0x82,0x82,0x00,0x83,0x83,0x83,0x00,0x84,0x84,0x84,0x00,
-	0x85,0x85,0x85,0x00,0x87,0x87,0x87,0x00,0x88,0x88,0x88,0x00,0x89,0x89,0x89,0x00,
-	0x8a,0x8a,0x8a,0x00,0x8b,0x8b,0x8b,0x00,0x8e,0x8e,0x8e,0x00,0x90,0x90,0x90,0x00,
-	0x91,0x91,0x91,0x00,0x92,0x92,0x92,0x00,0x94,0x94,0x94,0x00,0x95,0x95,0x95,0x00,
-	0x96,0x96,0x96,0x00,0x97,0x97,0x97,0x00,0x98,0x98,0x98,0x00,0x9b,0x9b,0x9b,0x00,
-	0x9c,0x9c,0x9c,0x00,0x9d,0x9d,0x9d,0x00,0xa0,0xa0,0xa0,0x00,0xa1,0xa1,0xa1,0x00,
-	0xa2,0xa2,0xa2,0x00,0xa4,0xa4,0xa4,0x00,0xa6,0xa6,0xa6,0x00,0xa7,0xa7,0xa7,0x00,
-	0xab,0xab,0xab,0x00,0xac,0xac,0xac,0x00,0xad,0xad,0xad,0x00,0xae,0xae,0xae,0x00,
-	0xaf,0xaf,0xaf,0x00,0xb0,0xb0,0xb0,0x00,0xb1,0xb1,0xb1,0x00,0xb2,0xb2,0xb2,0x00,
-	0xb3,0xb3,0xb3,0x00,0xb4,0xb4,0xb4,0x00,0xb5,0xb5,0xb5,0x00,0xb6,0xb6,0xb6,0x00,
-	0xb7,0xb7,0xb7,0x00,0xb9,0xb9,0xb9,0x00,0xbb,0xbb,0xbb,0x00,0xbc,0xbc,0xbc,0x00,
-	0xbe,0xbe,0xbe,0x00,0xbf,0xbf,0xbf,0x00,0xc0,0xc0,0xc0,0x00,0xc1,0xc1,0xc1,0x00,
-	0xc2,0xc2,0xc2,0x00,0xc3,0xc3,0xc3,0x00,0xc4,0xc4,0xc4,0x00,0xc5,0xc5,0xc5,0x00,
-	0xc9,0xc9,0xc9,0x00,0xcb,0xcb,0xcb,0x00,0xcc,0xcc,0xcc,0x00,0xce,0xce,0xce,0x00,
-	0xcf,0xcf,0xcf,0x00,0xd0,0xd0,0xd0,0x00,0xd1,0xd1,0xd1,0x00,0xd2,0xd2,0xd2,0x00,
-	0xd4,0xd4,0xd4,0x00,0xd5,0xd5,0xd5,0x00,0xd6,0xd6,0xd6,0x00,0xd9,0xd9,0xd9,0x00,
-	0xda,0xda,0xda,0x00,0xdb,0xdb,0xdb,0x00,0xdc,0xdc,0xdc,0x00,0xdd,0xdd,0xdd,0x00,
-	0xe0,0xe0,0xe0,0x00,0xe1,0xe1,0xe1,0x00,0xe2,0xe2,0xe2,0x00,0xe3,0xe3,0xe3,0x00,
-	0xe4,0xe4,0xe4,0x00,0xe6,0xe6,0xe6,0x00,0xe8,0xe8,0xe8,0x00,0xe9,0xe9,0xe9,0x00,
-	0xea,0xea,0xea,0x00,0xeb,0xeb,0xeb,0x00,0xec,0xec,0xec,0x00,0xed,0xed,0xed,0x00,
-	0xee,0xee,0xee,0x00,0xf0,0xf0,0xf0,0x00,0xf3,0xf3,0xf3,0x00,0xf4,0xf4,0xf4,0x00,
-	0xf5,0xf5,0xf5,0x00,0xf7,0xf7,0xf7,0x00,0xf8,0xf8,0xf8,0x00,0xf9,0xf9,0xf9,0x00,
-	0xfa,0xfa,0xfa,0x00,0xfb,0xfb,0xfb,0x00,0xfc,0xfc,0xfc,0x00,0xff,0xff,0xff,0x00,
-	0xff,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00
-};
-
-#define BMP_SIZE sizeof(gpi_bitmap)
-
-#endif
-- 
2.30.2